From: Øyvind Kolås Date: Mon, 29 Jul 2019 20:31:51 +0000 (+0200) Subject: build: remove autotools X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~11^2~43 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=06f82635bcd1f6999be8ce844a8905bf177c7b1b;p=babl.git build: remove autotools --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 414fc1d..61eb2eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,29 +30,6 @@ cache: - ninja -C _build - ninja -C _build test -.autotools-build: - extends: .build - artifacts: - when: always - paths: - - _build/*.log - - _build/*/*.log - - _build/*/*/*.log - script: - - mkdir _build - - cd _build - - ../autogen.sh - --enable-docs - --enable-f16c - --enable-mmx - --enable-sse - --enable-sse2 - --enable-sse3 - --enable-sse4_1 - ${LCMS_OPTION} - - make - - make check - latest-meson-lcms: extends: .meson-build variables: @@ -64,14 +41,3 @@ latest-meson-nolcms: variables: LCMS_OPTION : "-Dwith-lcms=false" EXTRA_PKGS: "meson" - -latest-autotools-lcms: - extends: .autotools-build - variables: - LCMS_OPTION : "--with-lcms" - EXTRA_PKGS: "lcms2" - -latest-autotools-nolcms: - extends: .autotools-build - variables: - LCMS_OPTION : "--without-lcms" diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 3859aff..0000000 --- a/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -SUBDIRS = \ - babl \ - extensions \ - tools \ - tests - -if ENABLE_DOCS -SUBDIRS+= docs -endif - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = babl.pc - -built_dist_files = README - -EXTRA_DIST = \ - $(built_dist_files) \ - AUTHORS \ - COPYING \ - INSTALL \ - NEWS \ - TODO \ - autogen.sh \ - babl.pc.in \ - export-symbols \ - meson_options.txt \ - meson.build - -DISTCLEANFILES = \ - $(built_dist_files) \ - babl.pc - -.PHONY: snapshot - - -if HAVE_W3M -README: all docs/index.html - $(W3M) -cols 72 -dump docs/index.html > $@ -else -README: - @echo "*** w3m must be available in order to make dist" - @false -endif - -snapshot: - $(MAKE) dist distdir=$(PACKAGE)-`date +"%Y%m%d"` -snapcheck: - $(MAKE) distcheck distdir=$(PACKAGE)-`date +"%Y%m%d"` - -distclean-local: - if test $(srcdir) = .; then :; else \ - rm -f $(BUILT_EXTRA_DIST); \ - fi - diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 4ea58bd..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1,82 +0,0 @@ -dnl BABL_DETECT_CFLAGS(RESULT, FLAGSET) -dnl Detect if the compiler supports a set of flags - -AC_DEFUN([BABL_DETECT_CFLAGS], -[ - $1= - for flag in $2; do - if test -z "[$]$1"; then - $1_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $flag" - AC_MSG_CHECKING([whether [$]CC understands [$]flag]) - AC_TRY_COMPILE([], [], [$1_works=yes], [$1_works=no]) - AC_MSG_RESULT([$]$1_works) - CFLAGS="[$]$1_save_CFLAGS" - if test "x[$]$1_works" = "xyes"; then - $1="$flag" - fi - fi - done -]) - - -# BABL_VARIADIC_MACROS -# -------------------- -# check for flavours of variadic macros -AC_DEFUN([BABL_VARIADIC_MACROS], -[AC_BEFORE([$0], [AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CPP]) -AC_CACHE_CHECK([for GNUC variadic macros], - [babl_cv_prog_gnuc_variadic_macros], - [# gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi - # is passed ISO vararg support is turned off, and there is no work - # around to turn it on, so we unconditionally turn it off. - { echo '#if __GNUC__ == 2 && __GNUC_MINOR__ == 95' - echo ' yes ' - echo '#endif'; } > conftest.c - if ${CPP} conftest.c | grep yes > /dev/null; then - babl_cv_prog_c_variadic_macros=no - babl_cv_prog_cxx_variadic_macros=no - fi - AC_TRY_COMPILE([],[int a(int p1, int p2, int p3); -#define call_a(params...) a(1,params) -call_a(2,3); - ], - babl_cv_prog_gnuc_variadic_macros=yes, - babl_cv_prog_gnuc_variadic_macros=no) -]) -if test x$babl_cv_prog_gnuc_variadic_macros = xyes; then - AC_DEFINE(BABL_GNUC_VARIADIC_MACROS, 1, [Define if the C pre-processor supports GNU style variadic macros]) -fi - -AC_CACHE_CHECK([for ISO C99 variadic macros in C], - [babl_cv_prog_c_variadic_macros], - [AC_TRY_COMPILE([],[int a(int p1, int p2, int p3); -#define call_a(...) a(1,__VA_ARGS__) -call_a(2,3); - ], - babl_cv_prog_c_variadic_macros=yes, - babl_cv_prog_c_variadic_macros=no) -]) -if test x$babl_cv_prog_c_variadic_macros = xyes ; then - AC_DEFINE(BABL_ISO_VARIADIC_MACROS, 1, [Define if the C pre-processor supports variadic macros]) -fi - -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_CACHE_CHECK([for ISO C99 variadic macros in C++], - [babl_cv_prog_cxx_variadic_macros], - [AC_LANG_PUSH(C++) - AC_TRY_COMPILE([],[int a(int p1, int p2, int p3); -#define call_a(...) a(1,__VA_ARGS__) -call_a(2,3); - ], - babl_cv_prog_cxx_variadic_macros=yes, - babl_cv_prog_cxx_variadic_macros=no) - AC_LANG_POP])], - [# No C++ compiler - babl_cv_prog_cxx_variadic_macros=no]) -if test x$babl_cv_prog_cxx_variadic_macros = xyes ; then - AC_DEFINE(BABL_ISO_CXX_VARIADIC_MACROS, 1, [Define if the C++ pre-processor supports variadic macros]) -fi -]) - diff --git a/babl/Makefile.am b/babl/Makefile.am deleted file mode 100644 index 2cae03d..0000000 --- a/babl/Makefile.am +++ /dev/null @@ -1,146 +0,0 @@ -## Source directory - -if PLATFORM_WIN32 -win32_no_undefined = -no-undefined -endif - -SUBDIRS = base - -c_sources = \ - babl.c \ - babl-cache.c \ - babl-component.c \ - babl-conversion.c \ - babl-core.c \ - babl-db.c \ - babl-extension.c \ - babl-fish-path.c \ - babl-fish-reference.c \ - babl-fish-simple.c \ - babl-fish.c \ - babl-format.c \ - babl-hash-table.c \ - babl-icc.c \ - babl-image.c \ - babl-internal.c \ - babl-introspect.c \ - babl-list.c \ - babl-memory.c \ - babl-model.c \ - babl-mutex.c \ - babl-palette.c \ - babl-polynomial.c \ - babl-ref-pixels.c \ - babl-sampling.c \ - babl-sanity.c \ - babl-space.c \ - babl-trc.c \ - babl-type.c \ - babl-util.c \ - babl-cpuaccel.c \ - babl-version.c - -h_sources = \ - babl.h \ - babl-class.h \ - babl-classes.h \ - babl-component.h \ - babl-conversion.h \ - babl-cpuaccel.h \ - babl-db.h \ - babl-extension.h \ - babl-fish.h \ - babl-format.h \ - babl-hash-table.h \ - babl-ids.h \ - babl-image.h \ - babl-internal.h \ - babl-introspect.h \ - babl-list.h \ - babl-macros.h \ - babl-memory.h \ - babl-model.h \ - babl-matrix.h \ - babl-mutex.h \ - babl-polynomial.h \ - babl-ref-pixels.h \ - babl-sampling.h \ - babl-space.h \ - babl-trc.h \ - babl-type.h \ - babl-types.h \ - babl-util.h - -library_includedir=$(includedir)/babl-$(BABL_API_VERSION)/babl -libinc_hdrs = \ - babl-introspect.h \ - babl-macros.h \ - babl-types.h \ - babl.h - -libinc_generated_hdrs = \ - babl-version.h - -library_include_HEADERS = \ - $(libinc_hdrs) $(libinc_generated_hdrs) - -AM_CPPFLAGS = \ - -DLIBDIR=\""$(libdir)"\" \ - -I$(top_srcdir) \ - -I$(top_srcdir)/babl/base - -lib_LTLIBRARIES= libbabl-@BABL_API_VERSION@.la - -libbabl_@BABL_API_VERSION@_la_SOURCES= $(h_sources) $(c_sources) -libbabl_@BABL_API_VERSION@_la_CFLAGS= $(SSE2_EXTRA_CFLAGS) $(LCMS_CFLAGS) - -libbabl_@BABL_API_VERSION@_la_LIBADD= \ - base/libbase.la \ - @LTLIBOBJS@ - - -libbabl_@BABL_API_VERSION@_la_LDFLAGS= \ - ${win32_no_undefined} \ - $(MATH_LIB) $(THREAD_LIB) $(LOG_LIB) \ - $(LCMS_LIBS) \ - -export-symbols $(top_srcdir)/export-symbols \ - -version-info $(BABL_LIBRARY_VERSION) - -EXTRA_DIST = \ - babl-ref-pixels.inc \ - meson.build - - -# If git is available, always check if git-version.h should be -# updated. If git is not available, don't do anything if git-version.h -# already exists because then we are probably working with a tarball -# in which case the git-version.h we ship is correct. - -libbabl_generated_sources = git-version.h -BUILT_SOURCES = git-version.h -CLEANFILES = git-version.h - -git-version.h: update-git-version-header - @if test -d "$(top_srcdir)/.git"; then \ - git_version="`git --git-dir=$(top_srcdir)/.git describe --always`"; \ - git_last_commit_year="`git --git-dir=$(top_srcdir)/.git log -n1 --reverse --pretty=%ci | cut -b 1-4`"; \ - elif test ! -f "$@"; then \ - git_version="Unknown, shouldn't happen"; \ - git_last_commit_timestamp=-1; \ - git_last_commit_year="`date -u '+%Y'`"; \ - fi; \ - if test -n "$$git_version"; then \ - echo "#ifndef __GIT_VERSION_H__" > "$@.tmp"; \ - echo "#define __GIT_VERSION_H__" >> "$@.tmp"; \ - echo "#define BABL_GIT_VERSION \"$$git_version\"" >> "$@.tmp"; \ - echo "#define BABL_GIT_LAST_COMMIT_YEAR \"$$git_last_commit_year\"" >> "$@.tmp"; \ - echo "#endif /* __GIT_VERSION_H__ */" >> "$@.tmp"; \ - fi - @if ( test -f "$@.tmp" && test -f "$@" && cmp "$@.tmp" "$@" > /dev/null ); then \ - rm -f "$@.tmp"; \ - elif test -f "$@.tmp"; then \ - mv "$@.tmp" "$@"; \ - echo " git HEAD changed: $@ regenerated"; \ - fi - -.PHONY: update-git-version-header diff --git a/babl/base/Makefile.am b/babl/base/Makefile.am deleted file mode 100644 index d9d422e..0000000 --- a/babl/base/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ - -h_sources = \ - babl-base.h - -c_sources = \ - babl-base.c \ - formats.c \ - pow-24.c \ - type-float.c \ - type-half.c \ - type-u8.c \ - type-u15.c \ - type-u16.c \ - type-u32.c \ - model-rgb.c \ - model-gray.c \ - model-cmyk.c \ - model-ycbcr.c - -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl $(LCMS_CFLAGS) - -noinst_LTLIBRARIES= libbase.la -libbase_la_SOURCES= $(h_sources) $(c_sources) -libbase_la_LIBADD = $(MATH_LIB) - -EXTRA_DIST = \ - util.h \ - pow-24.h \ - meson.build - diff --git a/configure.ac b/configure.ac deleted file mode 100644 index c0fc9b0..0000000 --- a/configure.ac +++ /dev/null @@ -1,618 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.54) - -# Making releases on the stable branch: -# BABL_MICRO_VERSION += 1; -# BABL_INTERFACE_AGE += 1; -# BABL_BINARY_AGE += 1; -# if any functions have been added, -# set BABL_INTERFACE_AGE to 0. -# if backwards compatibility has been broken, -# set BABL_BINARY_AGE _and_ BABL_INTERFACE_AGE to 0. - - -m4_define([babl_major_version], [0]) -m4_define([babl_minor_version], [1]) -m4_define([babl_micro_version], [69]) -m4_define([babl_real_version], - [babl_major_version.babl_minor_version.babl_micro_version]) -m4_define([babl_version], [babl_real_version]) - -dnl Number of releases since we've added interfaces -m4_define([babl_interface_age], [1]) -m4_define([babl_binary_age], - [m4_eval(100 * babl_minor_version + babl_micro_version)]) - -# This is the X.Y used in -lbabl-X.Y -m4_define([babl_api_version], [babl_major_version.babl_minor_version]) - -m4_define([stability_version_number], - m4_if(m4_eval(babl_major_version || babl_minor_version), [0], - [babl_micro_version], [babl_minor_version])) -m4_define([babl_unstable], - m4_if(m4_eval(stability_version_number % 2), [1], [yes], [no])) -m4_define([babl_stable], - m4_if(m4_eval(stability_version_number % 2), [0], [yes], [no])) - -AC_INIT(babl, babl_major_version.babl_minor_version.babl_micro_version) - -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_SRCDIR(babl/babl.h) -AC_CONFIG_MACRO_DIR([m4]) - -BABL_MAJOR_VERSION=babl_major_version -BABL_MINOR_VERSION=babl_minor_version -BABL_MICRO_VERSION=babl_micro_version -BABL_INTERFACE_AGE=babl_interface_age -BABL_BINARY_AGE=babl_binary_age -BABL_VERSION=babl_version -BABL_REAL_VERSION=babl_real_version -BABL_API_VERSION=babl_api_version -AC_SUBST(BABL_MAJOR_VERSION) -AC_SUBST(BABL_MINOR_VERSION) -AC_SUBST(BABL_MICRO_VERSION) -AC_SUBST(BABL_INTERFACE_AGE) -AC_SUBST(BABL_BINARY_AGE) -AC_SUBST(BABL_VERSION) -AC_SUBST(BABL_REAL_VERSION) -AC_SUBST(BABL_API_VERSION) - -BABL_RELEASE=babl_api_version -AC_SUBST(BABL_RELEASE) - -dnl The symbol BABL_UNSTABLE is defined above for substitution in -dnl Makefiles and conditionally defined here as a preprocessor symbol -dnl and automake conditional. -BABL_UNSTABLE=babl_unstable -if test "x$BABL_UNSTABLE" = "xyes"; then - AC_DEFINE(BABL_UNSTABLE, 1, - [Define to 1 if this is an unstable version of BABL]) -fi -AM_CONDITIONAL(BABL_UNSTABLE, test "x$BABL_UNSTABLE" = "xyes") -AC_SUBST(BABL_UNSTABLE) - - -# libtool versioning -m4_define([lt_current], [m4_eval(100 * babl_minor_version + babl_micro_version - babl_interface_age)]) -m4_define([lt_revision], [babl_interface_age]) -m4_define([lt_age], [m4_eval(babl_binary_age - babl_interface_age)]) -BABL_LIBRARY_VERSION="lt_current:lt_revision:lt_age" -BABL_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) -AC_SUBST(BABL_LIBRARY_VERSION) -AC_SUBST(BABL_CURRENT_MINUS_AGE) - -dnl ========================================================================== - -AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE([1.11 foreign no-define dist-bzip2 no-dist-gzip -Wno-portability]) - -# Enable silent build rules by default, requires at least -# Automake-1.11. Disable by either passing --disable-silent-rules to -# configure or passing V=1 to make -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -# Prefer clang on OSX, because GCC isn't updated - -case "$build_os" in - darwin10.* | darwin9.* | darwin8.*) - ;; - darwin*) - prefered_cc="clang" - prefered_cxx="clang++" - ;; - *) - ;; -esac - -if test -z "$CC" && test -n "$prefered_cc"; then - AC_MSG_NOTICE([setting CC to $prefered_cc for $build_os]) - CC=$prefered_cc -fi - -if test -z "$CXX" && test -n "$prefered_cc"; then - AC_MSG_NOTICE([setting CXX to $prefered_cxx for $build_os]) - CXX=$prefered_cxx -fi - -# Check for programs -AC_PROG_CC -AC_PROG_CC_C99 - -# Initialize libtool -LT_PREREQ([2.2]) -LT_INIT([disable-static win32-dll]) - -BABL_VARIADIC_MACROS - -dnl Initialize maintainer mode -AM_MAINTAINER_MODE([enable]) - -AC_HEADER_STDC -AM_SANITY_CHECK - -WEBSITE_HOST=pippin.gimp.org -AC_SUBST(WEBSITE_HOST) -WEBSITE_LOCATION=public_html/babl/ -AC_SUBST(WEBSITE_LOCATION) - - -if eval "test x$GCC = xyes"; then - case " $CFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wall" ;; - esac - -BABL_DETECT_CFLAGS(extra_warnings, '-Wdeclaration-after-statement') -CFLAGS="$CFLAGS $extra_warnings" - -BABL_DETECT_CFLAGS(extra_warnings, '-Wmissing-prototypes') -CFLAGS="$CFLAGS $extra_warnings" - -BABL_DETECT_CFLAGS(extra_warnings, '-Wmissing-declarations') -CFLAGS="$CFLAGS $extra_warnings" - -BABL_DETECT_CFLAGS(extra_warnings, '-Winit-self') -CFLAGS="$CFLAGS $extra_warnings" - -BABL_DETECT_CFLAGS(extra_warnings, '-Wpointer-arith') -CFLAGS="$CFLAGS $extra_warnings" - -BABL_DETECT_CFLAGS(extra_warnings, '-Wold-style-definition') -CFLAGS="$CFLAGS $extra_warnings" - -#BABL_DETECT_CFLAGS(extra_warnings, '-Ofast' ) -#CFLAGS="$CFLAGS $extra_warnings" - -fi - -AC_PATH_PROG(RSVG, rsvg-convert, no) -AM_CONDITIONAL(HAVE_RSVG, test "x$RSVG" != "xno") - -AC_PATH_PROG(W3M, w3m, no) -AM_CONDITIONAL(HAVE_W3M, test "x$W3M" != "xno") - -dnl disable docs generation. -AC_ARG_ENABLE([docs], - [ --disable-docs disable docs generation (default=no)],, - enable_docs="yes") - -AM_CONDITIONAL(ENABLE_DOCS, test "x$enable_docs" = "xyes") - -########################### -# Check target architecture -########################### - -AC_MSG_CHECKING([for target architecture]) -case x"$target" in - xNONE | x) - target_or_host="$host" ;; - *) - target_or_host="$target" ;; -esac -AC_MSG_RESULT([$target_or_host]) - -case "$target_or_host" in - i*86-*-*) - have_x86=yes - AC_DEFINE(ARCH_X86, 1, [Define to 1 if you are compiling for ix86.]) - ;; - x86_64-*-*) - have_x86=yes - AC_DEFINE(ARCH_X86, 1, [Define to 1 if you are compiling for ix86.]) - AC_DEFINE(ARCH_X86_64, 1, [Define to 1 if you are compiling for amd64.]) - ;; - ppc-*-* | powerpc-*) - have_ppc=yes - AC_DEFINE(ARCH_PPC, 1, [Define to 1 if you are compiling for PowerPC.]) - ;; - ppc64-*-* | powerpc64-*) - have_ppc=yes - AC_DEFINE(ARCH_PPC, 1, [Define to 1 if you are compiling for PowerPC.]) - AC_DEFINE(ARCH_PPC64, 1, [Define to 1 if you are compiling for PowerPC64.]) - ;; - *) - ;; -esac - -################ -# Check for lcms -################ - -AC_ARG_WITH(lcms, [ --without-lcms build without lcms support]) - -have_lcms="no (lcms support disabled)" -if test "x$with_lcms" != xno; then - have_lcms=yes - PKG_CHECK_MODULES(LCMS, lcms2 >= lcms_required_version, - AC_DEFINE(HAVE_LCMS, 1, [Define to 1 if lcms is available]) - LCMS='lcms$(EXEEXT)', - have_lcms="no (lcms not found or unusable)") -fi - -AC_SUBST(LCMS) -AM_CONDITIONAL(HAVE_LCMS, test "x$have_lcms" = xyes) - - -############################ -# Check how to find plug-ins -############################ - -AC_MSG_CHECKING([the extension for shared libraries]) -case "$target_or_host" in - hppa*-hpux*) # HP/UX - shrext=.sl - ;; - *-*-mingw* | *-*-cygwin*) # windows - shrext=.dll - ;; - *) # linux (and BSD?) - shrext=.so - ;; -esac - -SHREXT=$shrext -AC_SUBST(SHREXT) -AC_DEFINE_UNQUOTED(SHREXT, "$shrext", [File extension for shared libraries]) -AC_MSG_RESULT([$shrext]) - -dnl =========================================================================== - -################# -# Check for Win32 -################# - -AC_MSG_CHECKING([for some Win32 platform]) -case "$target_or_host" in - *-*-mingw* | *-*-cygwin*) - platform_win32=yes - ;; - *) - platform_win32=no - ;; -esac -AC_MSG_RESULT([$platform_win32]) -AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") - -MATH_LIB=-lm -THREAD_LIB=-lpthread -LOG_LIB= -AC_MSG_CHECKING([for native Win32]) -case "$target_or_host" in - *-*-mingw*) - os_win32=yes - PATH_SEP=';' - DIR_SEP='\\' - MATH_LIB= - THREAD_LIB= - ;; - *-*-android*) - os_win32=no - PATH_SEP=':' - DIR_SEP='/' - THREAD_LIB= - LOG_LIB='-llog' - ;; - *) - os_win32=no - PATH_SEP=':' - DIR_SEP='/' - ;; -esac -AC_MSG_RESULT([$os_win32]) -AC_SUBST(PATH_SEP) -AC_SUBST(DIR_SEP) -AC_SUBST(MATH_LIB) -AC_SUBST(THREAD_LIB) -AC_SUBST(LOG_LIB) - -AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes") -AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes") - - -dnl =========================================================================== - - -################# -# Check for some not-so-common features -################# - -# babl_fish_reference(), create_name() would like this -AC_MSG_CHECKING([for __thread]) -AC_LINK_IFELSE([AC_LANG_PROGRAM(, [static __thread char buf[1024];])], - [AC_DEFINE(HAVE_TLS, 1, - Define to 1 if compiler supports __thread) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) - - -dnl =========================================================================== - - -######################## -# Check for MMX assembly -######################## - -AC_ARG_ENABLE(mmx, - [ --enable-mmx enable MMX support (default=auto)],, - enable_mmx=$have_x86) - -AC_ARG_ENABLE(sse, - [ --enable-sse enable SSE support (default=auto)],, - enable_sse=$enable_mmx) - -AC_ARG_ENABLE(sse2, - [ --enable-sse2 enable SSE2 support (default=auto)],, - enable_sse2=$enable_sse) - -AC_ARG_ENABLE(sse3, - [ --enable-sse3 enable SSE3 support (default=auto)],, - enable_sse3=$enable_sse2) - -AC_ARG_ENABLE(sse4_1, - [ --enable-sse4_1 enable SSE4_1 support (default=auto)],, - enable_sse4_1=$enable_sse) - -AC_ARG_ENABLE(avx2, - [ --enable-avx2 enable AVX2 support (default=auto)],, - enable_avx2=$enable_sse) - -AC_ARG_ENABLE(f16c, - [ --enable-f16c enable hardware half-float support (default=auto)],, - enable_f16c=$enable_sse) - -if test "x$enable_mmx" = xyes; then - BABL_DETECT_CFLAGS(MMX_EXTRA_CFLAGS, '-mmmx') - SSE_EXTRA_CFLAGS= - SSE2_EXTRA_CFLAGS= - SSE3_EXTRA_CFLAGS= - SSE4_1_EXTRA_CFLAGS= - AVX2_EXTRA_CFLAGS= - F16C_EXTRA_CFLAGS= - - AC_MSG_CHECKING(whether we can compile MMX code) - - mmx_save_CFLAGS="$CFLAGS" - CFLAGS="$mmx_save_CFLAGS $MMX_EXTRA_CFLAGS" - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[asm ("movq 0, %mm0");])], - - AC_DEFINE(USE_MMX, 1, [Define to 1 if MMX assembly is available.]) - AC_MSG_RESULT(yes) - - if test "x$enable_sse" = xyes; then - BABL_DETECT_CFLAGS(fpmath_flag, '-mfpmath=sse') - if test "x$platform_win32" = xyes; then - BABL_DETECT_CFLAGS(stack_align, '-mstackrealign') - fi - SSE_EXTRA_CFLAGS="$MMX_EXTRA_CFLAGS $stack_align $fpmath_flag" - - BABL_DETECT_CFLAGS(sse_flag, '-msse') - SSE_EXTRA_CFLAGS="$SSE_EXTRA_CFLAGS $sse_flag" - - AC_MSG_CHECKING(whether we can compile SSE code) - - CFLAGS="$CFLAGS $sse_flag" - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[asm ("movntps %xmm0, 0");])], - AC_DEFINE(USE_SSE, 1, [Define to 1 if SSE assembly is available.]) - AC_MSG_RESULT(yes) - , - enable_sse=no - AC_MSG_RESULT(no) - AC_MSG_WARN([The assembler does not support the SSE command set.]) - ) - - if test "x$enable_sse2" = xyes; then - BABL_DETECT_CFLAGS(sse2_flag, '-msse2') - SSE2_EXTRA_CFLAGS="$SSE_EXTRA_CFLAGS $sse2_flag" - - AC_MSG_CHECKING(whether we can compile SSE2 code) - - CFLAGS="$CFLAGS $sse2_flag" - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[asm ("punpckhwd %xmm0,%xmm1");])], - AC_DEFINE(USE_SSE2, 1, [Define to 1 if SSE2 assembly is available.]) - AC_MSG_RESULT(yes) - , - enable_sse2=no - AC_MSG_RESULT(no) - AC_MSG_WARN([The assembler does not support the SSE2 command set.]) - ) - - if test "x$enable_sse3" = xyes; then - BABL_DETECT_CFLAGS(sse3_flag, '-msse3') - SSE3_EXTRA_CFLAGS="$SSE2_EXTRA_CFLAGS $sse3_flag" - - AC_MSG_CHECKING(whether we can compile SSE3 code) - - CFLAGS="$CFLAGS $sse3_flag" - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[asm ("addsubpd %xmm0,%xmm1");])], - AC_DEFINE(USE_SSE3, 1, [Define to 1 if SSE3 assembly is available.]) - AC_MSG_RESULT(yes) - , - enable_sse3=no - AC_MSG_RESULT(no) - AC_MSG_WARN([The assembler does not support the SSE3 command set.]) - ) - - if test "x$enable_sse4_1" = xyes; then - BABL_DETECT_CFLAGS(sse4_1_flag, '-msse4.1') - SSE4_1_EXTRA_CFLAGS="$SSE3_EXTRA_CFLAGS $sse4_1_flag" - - AC_MSG_CHECKING(whether we can compile SSE4_1 code) - - CFLAGS="$CFLAGS $sse4_1_flag" - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[asm ("pmovzxbd %xmm0,%xmm1");])], - AC_DEFINE(USE_SSE4_1, 1, [Define to 1 if SSE4_1 assembly is available.]) - AC_MSG_RESULT(yes) - , - enable_sse4_1=no - AC_MSG_RESULT(no) - AC_MSG_WARN([The assembler does not support the SSE4_1 command set.]) - ) - - if test "x$enable_avx2" = xyes; then - BABL_DETECT_CFLAGS(avx2_flag, '-mavx2') - AVX2_EXTRA_CFLAGS="$SSE4_1_EXTRA_CFLAGS $avx2_flag" - - AC_MSG_CHECKING(whether we can compile AVX2 code) - - CFLAGS="$CFLAGS $avx2_flag" - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[asm ("vpgatherdd %ymm0,(%rax,%ymm1,4),%ymm2");])], - AC_DEFINE(USE_AVX2, 1, [Define to 1 if AVX2 assembly is available.]) - AC_MSG_RESULT(yes) - , - enable_avx2=no - AC_MSG_RESULT(no) - AC_MSG_WARN([The assembler does not support the AVX2 command set.]) - ) - fi - fi - fi - fi - - CFLAGS="$mmx_save_CFLAGS" - - if test "x$enable_f16c" = xyes; then - BABL_DETECT_CFLAGS(f16c_flag, '-mf16c') - F16C_EXTRA_CFLAGS="$SSE_EXTRA_CFLAGS $f16c_flag" - - AC_MSG_CHECKING(whether we can compile half-floating point code) - - CFLAGS="$CFLAGS $sse_flag $f16c_flag" - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[__m128 val = _mm_cvtph_ps ((__m128i)_mm_setzero_ps()); __m128i val2 = _mm_insert_epi64((__m128i)_mm_setzero_ps(), 0, 0);])], - AC_DEFINE(USE_F16C, 1, [Define to 1 if f16c intrinsics are available.]) - AC_MSG_RESULT(yes) - , - enable_f16c=no - AC_MSG_RESULT(no) - AC_MSG_WARN([The compiler does not support f16c intrinsics.]) - ) - fi - - fi - , - enable_mmx=no - AC_MSG_RESULT(no) - AC_MSG_WARN([The assembler does not support the MMX command set.]) - ) - - CFLAGS="$mmx_save_CFLAGS" - - AC_SUBST(MMX_EXTRA_CFLAGS) - AC_SUBST(SSE_EXTRA_CFLAGS) - AC_SUBST(SSE2_EXTRA_CFLAGS) - AC_SUBST(SSE3_EXTRA_CFLAGS) - AC_SUBST(SSE4_1_EXTRA_CFLAGS) - AC_SUBST(AVX2_EXTRA_CFLAGS) - AC_SUBST(F16C_EXTRA_CFLAGS) -fi - - -############################ -# Check for AltiVec assembly -############################ - -AC_ARG_ENABLE(altivec, - [ --enable-altivec enable AltiVec support (default=auto)],, - enable_altivec=$have_ppc) - -if test "x$enable_altivec" = xyes; then - - BABL_DETECT_CFLAGS(altivec_flag, '-faltivec' '-maltivec -mabi=altivec') - - ALTIVEC_EXTRA_CFLAGS= - case "$altivec_flag" in - -maltivec*) - altivec_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$altivec_save_CPPFLAGS $altivec_flag" - AC_CHECK_HEADERS(altivec.h, [ALTIVEC_EXTRA_CFLAGS="$altivec_flag"]) - CPPFLAGS="$altivec_save_CPPFLAGS" - ;; - *) - ALTIVEC_EXTRA_CFLAGS="$altivec_flag" - ;; - esac - AC_SUBST(ALTIVEC_EXTRA_CFLAGS) - - AC_MSG_CHECKING(whether we can compile AltiVec code) - - can_use_altivec=no - if test -z "$ALTIVEC_EXTRA_CFLAGS"; then - AC_MSG_RESULT(no) - AC_MSG_WARN([The compiler does not support the AltiVec command set.]) - else - case "$target_or_host" in - *-*-darwin*) - can_use_altivec=yes - AC_DEFINE(HAVE_ALTIVEC_SYSCTL, 1, - [Define to 1 if the altivec runtime test should use a sysctl.]) - ;; - *) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[asm ("vand %v0, %v0, %v0");])], - can_use_altivec=yes, can_use_altivec=no) - ;; - esac - AC_MSG_RESULT($can_use_altivec) - - if test "x$can_use_altivec" = "xyes"; then - AC_DEFINE(USE_ALTIVEC, 1, [Define to 1 if AltiVec support is available.]) - else - enable_altivec=no - AC_MSG_WARN([The assembler does not support the AltiVec command set.]) - fi - fi - - enable_altivec="$can_use_altivec" -fi - - -################## -# Check for random -################## -have_srandom=no -AC_CHECK_FUNC(srandom, have_srandom=yes) -AM_CONDITIONAL([HAVE_SRANDOM], [test x$have_srandom = xyes]) - -dnl =========================================================================== - -AC_CHECK_HEADERS(dl.h) - -AC_SEARCH_LIBS([dlopen], [dl]) -AC_SEARCH_LIBS([rint], [m]) - -AC_REPLACE_FUNCS(gettimeofday) -AC_CHECK_FUNCS(rint) - -#BABL_PATH_SEPARATOR must be defined as a character. -#BABL_DIR_SEPARATOR must be defined as a string. -AC_DEFINE_UNQUOTED(BABL_PATH_SEPARATOR, '$PATH_SEP', [separator between paths in BABL_PATH]) -AC_DEFINE_UNQUOTED(BABL_DIR_SEPARATOR, "$DIR_SEP", [separator between directories in BABL_PATH]) - -AC_DEFINE_UNQUOTED(BABL_LIBRARY, "$PACKAGE_NAME-$BABL_API_VERSION", [name of BABL library]) - - - -dnl =========================================================================== - -AC_CONFIG_FILES( -Makefile -babl.pc -babl/Makefile -babl/babl-version.h -babl/base/Makefile -docs/Makefile -docs/index-static.html -docs/graphics/Makefile -tests/Makefile -tools/Makefile -extensions/Makefile -INSTALL -) - -AC_OUTPUT diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index a5724fe..0000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,129 +0,0 @@ -# programs used for doc creation -babl_fish_path_dhtml = $(top_builddir)/tools/babl_fish_path_dhtml$(EXEEXT) -babl_fish_path_fitness = $(top_builddir)/tools/babl_fish_path_fitness$(EXEEXT) -babl_html_dump = $(top_builddir)/tools/babl-html-dump$(EXEEXT) - -.SILENT: -SUBDIRS= graphics -DIST_SUBDIRS= graphics - -# The patterns used for html creation in the babl build system -# is very small, and should probably be documented in a tutorial. -# -# -# -HTML_FILES = index-static.html \ - index.html \ - CMYK.html \ - OldNews.html \ - Glossary.html \ - ColorManagement.html \ - SymmetricAlpha.html \ - Reference.html - -EXTRA_DIST= \ - babl.css \ - tools/xml_insert.sh \ - tools/changelog2rss \ - index-static.html.in \ - ColorManagement-static.html \ - Reference-static.html \ - CMYK-static.html \ - OldNews-static.html \ - Glossary-static.html \ - SymmetricAlpha-static.html \ - COPYING \ - toc \ - COPYING.LESSER \ - meson.build - -BUILT_EXTRA_DIST = index.html ColorManagement.html CMYK.html OldNews.html SymmetricAlpha.html Reference.html Glossary.html - -CLEANFILES = README changelog.rss -DISTCLEANFILES = index-static.html $(BUILT_EXTRA_DIST) - -all: $(HTML_FILES) - -SymmetricAlpha.html: SymmetricAlpha-static.html toc - echo -n "HTML: $@" - cp $< $@ - $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ TOC $(top_srcdir)/docs/toc - echo " [OK]" - -CMYK.html: CMYK-static.html toc - echo -n "HTML: $@" - cp $< $@ - $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ TOC $(top_srcdir)/docs/toc - echo " [OK]" - - -OldNews.html: OldNews-static.html toc - echo -n "HTML: $@" - cp $< $@ - $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ TOC $(top_srcdir)/docs/toc - echo " [OK]" - -Glossary.html: Glossary-static.html toc - echo -n "HTML: $@" - cp $< $@ - $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ TOC $(top_srcdir)/docs/toc - echo " [OK]" - -ColorManagement.html: ColorManagement-static.html toc - echo -n "HTML: $@" - cp $< $@ - $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ TOC $(top_srcdir)/docs/toc - echo " [OK]" - -index.html: index-static.html \ - $(top_srcdir)/AUTHORS \ - $(top_srcdir)/TODO \ - $(top_srcdir)/NEWS \ - toc \ - Makefile.am - echo -n "HTML: $@" - cp $< $@ - $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ AUTHORS $(top_srcdir)/AUTHORS - $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ TODO $(top_srcdir)/TODO - $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ NEWS $(top_srcdir)/NEWS - $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ TOC $(top_srcdir)/docs/toc - echo " [OK]" - - -Reference.html: Reference-static.html \ - $(babl_html_dump) \ - toc \ - Makefile.am - echo -n "HTML: $@" - cp $< $@ - (which mktemp > /dev/null 2>&1 && TMPFILE=`mktemp` || TMPFILE="/tmp/babl_build_tempfile" ;\ - export BABL_PATH="$(top_builddir)/extensions:$(top_builddir)/extensions/.libs"; $(babl_html_dump) > $$TMPFILE;\ - $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ BablBase $$TMPFILE;\ - rm -f $$TMPFILE ) - echo -n "." - $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ TOC $(top_srcdir)/docs/toc - echo " [OK]" - -distclean-local: - if test $(srcdir) = .; then :; else \ - rm -f $(BUILT_EXTRA_DIST); \ - fi - -web: all graphics - echo -n " WEB: " - ping -c 1 $(WEBSITE_HOST) >/dev/null && \ - (\ - scp *.txt *.html *.css\ - "$(WEBSITE_HOST):$(WEBSITE_LOCATION)/" >/dev/null && \ - echo -n "."; \ - scp graphics/*.png graphics/*.html\ - "$(WEBSITE_HOST):$(WEBSITE_LOCATION)/graphics/" >/dev/null\ - &&\ - echo "[OK]"\ - ||\ - echo "FAIL scp failed (does dirs exist?)."\ - )\ - || \ - (\ - echo "FAIL $(WEBSITE_HOST) not reachable."\ - ) diff --git a/docs/graphics/Makefile.am b/docs/graphics/Makefile.am deleted file mode 100644 index dbc46d1..0000000 --- a/docs/graphics/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -.SILENT: - -if HAVE_RSVG -PNG_FILES = \ - babl-a4poster.png \ - babl-16x16.png \ - babl-48x48.png -endif - -SVG_FILES = \ - babl-a4poster.svg \ - babl-16x16.svg \ - babl-48x48.svg - -EXTRA_DIST = \ - index.html \ - $(PNG_FILES) \ - $(SVG_FILES) \ - meson.build - -MAINTAINERCLEANFILES = $(PNG_FILES) - -all: $(MAINTAINERCLEANFILES) - -RSVG_CMD = echo -n " SVG: $@" ;\ - $(RSVG) -o $@ $< \ - &&\ - echo " [OK]"\ - ||\ - echo " FAIL" - -if HAVE_RSVG -dist-check-rsvg: - -.svg.png: - $(RSVG_CMD) -#-e $@ $< 2>/dev/null - -# the png version of the a4 poster is used as a webgraphic -# , thus it is rendered with the background alpha set to -# 0.0 -babl-a4poster.png: babl-a4poster.svg - echo -n " SVG: $@" ;\ - $(RSVG) -w 256 -o $@ $< \ - &&\ - echo " [OK]"\ - ||\ - echo " FAIL" -else -dist-check-rsvg: - @echo "*** rsvg must be available in order to make dist" - @false -endif - - -dist-hook: dist-check-rsvg diff --git a/extensions/Makefile.am b/extensions/Makefile.am deleted file mode 100644 index 1fad9ef..0000000 --- a/extensions/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -if PLATFORM_WIN32 -AM_LDFLAGS = -module -avoid-version -no-undefined -else -AM_LDFLAGS = -module -avoid-version -endif - -noinst_HEADERS = util.h - - -AM_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/babl \ - -I$(top_srcdir)/extensions \ - $(LCMS_CFLAGS) - -extdir = $(libdir)/babl-@BABL_API_VERSION@ -ext_LTLIBRARIES = \ - u16.la \ - u32.la \ - cairo.la \ - CIE.la \ - half.la \ - gegl-fixups.la \ - gggl-lies.la \ - gggl-table.la \ - gggl-table-lies.la \ - gggl.la \ - gimp-8bit.la \ - grey.la \ - double.la \ - float.la \ - fast-float.la \ - naive-CMYK.la \ - HCY.la \ - HSL.la \ - HSV.la \ - simple.la \ - sse2-float.la \ - sse2-int8.la \ - sse2-int16.la \ - sse4-int8.la \ - sse-half.la \ - avx2-int8.la \ - two-table.la \ - ycbcr.la - -cairo_la_SOURCES = cairo.c -CIE_la_SOURCES = CIE.c -simple_la_SOURCES = simple.c -gegl_fixups_la_SOURCES = gegl-fixups.c -gggl_lies_la_SOURCES = gggl-lies.c -gggl_table_lies_la_SOURCES = gggl-table-lies.c -gggl_table_la_SOURCES = gggl-table.c -gggl_la_SOURCES = gggl.c -gimp_8bit_la_SOURCES = gimp-8bit.c -grey_la_SOURCES = grey.c -naive_CMYK_la_SOURCES = naive-CMYK.c -HCY_la_SOURCES = HCY.c -HSL_la_SOURCES = HSL.c -HSV_la_SOURCES = HSV.c -sse2_float_la_SOURCES = sse2-float.c -sse2_int8_la_SOURCES = sse2-int8.c -sse2_int16_la_SOURCES = sse2-int16.c -sse4_int8_la_SOURCES = sse4-int8.c -sse_half_la_SOURCES = sse-half.c -avx2_int8_la_SOURCES = avx2-int8.c avx2-int8-tables.h -two_table_la_SOURCES = two-table.c two-table-tables.h -ycbcr_la_SOURCES = ycbcr.c -float_la_SOURCES = float.c -fast_float_la_SOURCES = fast-float.c - -LIBS = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ - $(MATH_LIB) $(THREAD_LIB) - -CIE_la_CFLAGS = $(SSE2_EXTRA_CFLAGS) -sse2_float_la_CFLAGS = $(SSE2_EXTRA_CFLAGS) -sse2_int8_la_CFLAGS = $(SSE2_EXTRA_CFLAGS) -sse2_int16_la_CFLAGS = $(SSE2_EXTRA_CFLAGS) -sse4_int8_la_CFLAGS = $(SSE4_1_EXTRA_CFLAGS) -sse_half_la_CFLAGS = $(SSE4_1_EXTRA_CFLAGS) $(F16C_EXTRA_CFLAGS) -avx2_int8_la_CFLAGS = $(AVX2_EXTRA_CFLAGS) - -EXTRA_DIST = \ - meson.build diff --git a/m4/.gitignore b/m4/.gitignore deleted file mode 100644 index 94e6f26..0000000 --- a/m4/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/libtool.m4 -/ltoptions.m4 -/ltsugar.m4 -/ltversion.m4 -/lt~obsolete.m4 diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 702a834..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -if OS_UNIX -CONCURRENCY_STRESS_TESTS = \ - concurrency-stress-test \ - palette-concurrency-stress-test -endif - -C_TESTS = \ - alpha_symmetric_transform \ - cairo_cmyk_hack \ - grayscale_to_rgb \ - chromaticities \ - rgb_to_bgr \ - rgb_to_ycbcr \ - srgb_to_lab_u8 \ - sanity \ - babl_class_name \ - extract \ - floatclamp \ - float-to-8bit \ - hsl \ - hsva \ - types \ - format_with_space \ - palette \ - nop \ - n_components \ - n_components_cast \ - models \ - cairo-RGB24 \ - transparent \ - $(CONCURRENCY_STRESS_TESTS) - -TESTS = \ - $(C_TESTS) - -TESTS_ENVIRONMENT = LD_LIBRARY_PATH=$(top_builddir)/babl:$LD_LIBRARY_PATH GI_TYPELIB_PATH=$(top_builddir)/babl BABL_PATH=$(top_builddir)/extensions/.libs - -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl $(LCMS_CFLAGS) -AM_LDFLAGS = $(THREAD_LIB) -no-install - -LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ - $(MATH_LIB) $(THREAD_LIB) - -EXTRA_DIST = \ - common.inc \ - meson.build - -noinst_PROGRAMS = \ - $(C_TESTS) diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index fb35837..0000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl $(LCMS_CFLAGS) -AM_LDFLAGS = -no-install - -LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ - $(MATH_LIB) $(THREAD_LIB) - -noinst_PROGRAMS = \ - babl-verify \ - babl-benchmark \ - babl-icc-dump \ - babl-icc-rewrite \ - trc-validator \ - introspect \ - babl_fish_path_fitness \ - babl-html-dump \ - conversions \ - formats -if HAVE_SRANDOM -noinst_PROGRAMS += \ - babl-gen-test-pixels -endif - -EXTRA_DIST = \ - meson.build \ No newline at end of file